style: New window-icon class to split it from icon-dropshadow

- new class for window icons in window picker
- move HC specific styles to this new class

Fixes: https://gitlab.gnome.org/GNOME/gnome-shell-extensions/-/issues/507
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3310>

diff --git a/data/theme/gnome-shell-sass/widgets/_base.scss b/data/theme/gnome-shell-sass/widgets/_base.scss
index 7d6f2809e85002813645d2c0a7db6eafe9dd061c..20a1666e2f6354e00d8b1fd15b8828ca4e800425 100644 (file)
--- a/data/theme/gnome-shell-sass/widgets/_base.scss
+++ b/data/theme/gnome-shell-sass/widgets/_base.scss
@@ -18,10 +18,5 @@
 
   @if $contrast == 'high' {
     icon-shadow: none;
-    background-color: $osd_bg_color;
-    padding: $base_padding * 2;
-    border-radius: $modal_radius;
-    border: 2px solid $hc_inset_color;
-    margin: $base_padding * 3;
   }
 }

diff --git a/data/theme/gnome-shell-sass/widgets/_window-picker.scss b/data/theme/gnome-shell-sass/widgets/_window-picker.scss
index c500a0af74483bb71e3b255b333c17d445f46b30..75626633fae5ed177fd18fe683f13142a15f9b4c 100644 (file)
--- a/data/theme/gnome-shell-sass/widgets/_window-picker.scss
+++ b/data/theme/gnome-shell-sass/widgets/_window-picker.scss
@@ -7,6 +7,19 @@ $window_close_button_color: transparentize(lighten($system_bg_color, 7%), .02);
   spacing: $base_padding;
 }
 
+// Window icons
+.window-icon {
+  // styled only with .icon-dropshadow
+  // but has a different style in high-contrast
+  @if $contrast == 'high' {
+    background-color: $osd_bg_color;
+    padding: $base_padding * 2;
+    border-radius: $modal_radius;
+    border: 2px solid $hc_inset_color;
+    margin: $base_padding * 3;
+  }
+}
+
 // Window titles
 .window-caption {
   @extend %tooltip;

diff --git a/js/ui/windowPreview.js b/js/ui/windowPreview.js
index d865e6e25b72f58658b717e0e525008c7800917e..b98079b2875d73defdacd5bad2d159f07ccf898b 100644 (file)
--- a/js/ui/windowPreview.js
+++ b/js/ui/windowPreview.js
@@ -133,6 +133,7 @@ export const WindowPreview = GObject.registerClass({
         const tracker = Shell.WindowTracker.get_default();
         const app = tracker.get_window_app(this.metaWindow);
         this._icon = app.create_icon_texture(ICON_SIZE);
+        this._icon.add_style_class_name('window-icon');
         this._icon.add_style_class_name('icon-dropshadow');
         this._icon.set({
             reactive: true,